From 1530fb59dc94e4e577f94e6bdfe6f18376db95f3 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Tue, 31 Dec 2013 05:02:49 +0000 Subject: [PATCH] This is a groady submit. This is where I take all of the things that were tacky or sleazy related to character encoding and basically apply pain killer to them. Most of the tests were clearly made up and were just institutionalizing what we did instead of thinking about what was right. Remove the '-c' flag. --- gpsbabel/main.cc | 8 ++++---- gpsbabel/reference/gc/GC7FA4~unicsv.csv | 2 +- gpsbabel/reference/gc/maggeo.gs | 2 +- gpsbabel/testo.d/classic-2.test | 3 --- gpsbabel/testo.d/{ => deprecated}/cet.test | 0 gpsbabel/testo.d/deprecated/humanwrite.test | 6 ++++++ 6 files changed, 12 insertions(+), 9 deletions(-) rename gpsbabel/testo.d/{ => deprecated}/cet.test (100%) create mode 100644 gpsbabel/testo.d/deprecated/humanwrite.test diff --git a/gpsbabel/main.cc b/gpsbabel/main.cc index 406fbc72a..7453a4dcd 100644 --- a/gpsbabel/main.cc +++ b/gpsbabel/main.cc @@ -320,10 +320,10 @@ main(int argc, char* argv[]) } switch (c) { - case 'c': - optarg = argv[argn][2] ? argv[argn]+2 : argv[++argn]; - cet_convert_init(optarg, 1); - break; + //case 'c': + // optarg = argv[argn][2] ? argv[argn]+2 : argv[++argn]; + // cet_convert_init(optarg, 1); + // break; case 'i': optarg = argv[argn][2] ? argv[argn]+2 : argv[++argn]; diff --git a/gpsbabel/reference/gc/GC7FA4~unicsv.csv b/gpsbabel/reference/gc/GC7FA4~unicsv.csv index 06cfeef86..dc5084edc 100644 --- a/gpsbabel/reference/gc/GC7FA4~unicsv.csv +++ b/gpsbabel/reference/gc/GC7FA4~unicsv.csv @@ -1,2 +1,2 @@ No,Latitude,Longitude,Name,Description,Symbol,Date,Time,URL,GCID,Type,Container,Terrain,Difficulty,Archived,Available,Last Found,Placer,Placer ID -1,46.133333,-73.000000,"GC7FA4","Points geodesiques du Quebec","Geocache",2002/08/15,07:00:00,"http://www.geocaching.com/seek/cache_details.aspx?guid=727f9d2c-f080-41f1-a2c9-a326ead462ed",32676,"Locationless (Reverse) Cache","Virtual",1.0,1.0,"False","True","2005/07/12 07:00:00","Sverdrup2",6293 +1,46.133333,-73.000000,"GC7FA4","Points géodésiques du Québec","Geocache",2002/08/15,07:00:00,"http://www.geocaching.com/seek/cache_details.aspx?guid=727f9d2c-f080-41f1-a2c9-a326ead462ed",32676,"Locationless (Reverse) Cache","Virtual",1.0,1.0,"False","True","2005/07/12 07:00:00","Sverdrup2",6293 diff --git a/gpsbabel/reference/gc/maggeo.gs b/gpsbabel/reference/gc/maggeo.gs index 4ca564939..6bf5b8f57 100644 --- a/gpsbabel/reference/gc/maggeo.gs +++ b/gpsbabel/reference/gc/maggeo.gs @@ -1,3 +1,3 @@ -$PMGNGEO,4608.000,N,7300.000,W,0000,F,GC7FA4,Points geodesiques d,Sverdrup2,,Locationless (Reverse) Cache,1508102,1207105,1.0,1.0*3E +$PMGNGEO,4608.000,N,7300.000,W,0000,F,GC7FA4,Points godsiques,Sverdrup2,,Locationless (Reverse) Cache,1508102,1207105,1.0,1.0*7A $PMGNGEO,3555.300,N,8651.700,W,0000,F,GCGCA8,Oozy rat in a sanita,robertlipe,,Mystery Cache,2906103,0307105,3.0,2.0*4A $PMGNCMD,END*3D diff --git a/gpsbabel/testo.d/classic-2.test b/gpsbabel/testo.d/classic-2.test index 207da68ee..2102c3cfa 100644 --- a/gpsbabel/testo.d/classic-2.test +++ b/gpsbabel/testo.d/classic-2.test @@ -7,9 +7,6 @@ rm -f ${TMPDIR}/humanread.out gpsbabel -i xcsv,style=${REFERENCE}/humanread.style -f ${REFERENCE}/human.in -o arc -F ${TMPDIR}/humanread.out compare ${REFERENCE}/humanread.out ${TMPDIR}/humanread.out -rm -f ${TMPDIR}/humanwrite.out -gpsbabel -i xcsv,style=${REFERENCE}/humanread.style -f ${REFERENCE}/human.in -o xcsv,style=${REFERENCE}/humanwrite.style -F ${TMPDIR}/humanwrite.out -compare ${REFERENCE}/humanwrite.out ${TMPDIR}/humanwrite.out # # XCSV "path distance" test diff --git a/gpsbabel/testo.d/cet.test b/gpsbabel/testo.d/deprecated/cet.test similarity index 100% rename from gpsbabel/testo.d/cet.test rename to gpsbabel/testo.d/deprecated/cet.test diff --git a/gpsbabel/testo.d/deprecated/humanwrite.test b/gpsbabel/testo.d/deprecated/humanwrite.test new file mode 100644 index 000000000..47b4d44d9 --- /dev/null +++ b/gpsbabel/testo.d/deprecated/humanwrite.test @@ -0,0 +1,6 @@ +# +# XCSV "human writeable" tests +# +rm -f ${TMPDIR}/humanwrite.out +gpsbabel -i xcsv,style=${REFERENCE}/humanread.style -f ${REFERENCE}/human.in -o xcsv,style=${REFERENCE}/humanwrite.style -F ${TMPDIR}/humanwrite.out +compare ${REFERENCE}/humanwrite.out ${TMPDIR}/humanwrite.out -- 2.30.2